302a468d4ee0ef79a863ea63346865c480a47ff6,dom/openapi/src/com/intellij/util/xml/MergingFileDescription.java,MergingFileDescription,getMergedRoot,#DomElement#,50

Before Change



    ArrayList<T> roots = new ArrayList<T>(files.size());
    for (XmlFile file: files) {
      roots.add(element.getManager().<T>getFileElement(file).getRootElement());
    }

    if (roots.size() == 1) {

After Change



    ArrayList<T> roots = new ArrayList<T>(files.size());
    for (XmlFile file: files) {
      final DomFileElement<T> fileElement = element.getManager().getFileElement(file);
      if (fileElement != null) {
        roots.add(fileElement.getRootElement());
      }
    }